118. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2022-09-08 08:49:15 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

118.1 Files compared

#LocationFileLast Modified
1/Volumes/Data 1/Ampps/www/Porto v4.0.2/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Smartwave_Porto/templates/htmlsidebar_sticky.phtml2021-06-12 07:57:14 +0000
2Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Smartwave_Porto/templates/htmlsidebar_sticky.phtml2021-06-12 07:57:14 +0000

118.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged144
Changed00
Inserted00
Removed00

118.3 Comparison options

WhitespaceConsecutive whitespace is treated as a single space
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersNot shown in the comparison detail
Active line-pairing rules

118.4 Active regular expressions

No regular expressions were active.

118.5 Comparison detail

1 <?php 1 <?php
2     $sidebar_sticky = $this->getConfig('porto_settings/general/sidebar_sticky'); 2     $sidebar_sticky = $this->getConfig('porto_settings/general/sidebar_sticky');
3 ?> 3 ?>
4 <?php if($sidebar_sticky): ?> 4 <?php if($sidebar_sticky): ?>
5 <script type="text/javascript"> 5 <script type="text/javascript">
6 require([ 6 require([
7     'jquery', 7     'jquery',
8     'themeSticky' 8     'themeSticky'
9 ], function ($) { 9 ], function ($) {
10   if(!$("body").hasClass("page-layout-1column") && !$("body").hasClass("account")) { 10   if(!$("body").hasClass("page-layout-1column") && !$("body").hasClass("account")) {
11     $(".sidebar.sidebar-main .sidebar-content").themeSticky({ 11     $(".sidebar.sidebar-main .sidebar-content").themeSticky({
12       autoInit: true, 12       autoInit: true,
13       minWidth: 992, 13       minWidth: 992,
14       containerSelector: '.page-main .columns', 14       containerSelector: '.page-main .columns',
15       autoFit: true, 15       autoFit: true,
16       paddingOffsetBottom: 10, 16       paddingOffsetBottom: 10,
17       paddingOffsetTop: 60 17       paddingOffsetTop: 60
18     }); 18     });
19   } 19   }
20 }); 20 });
21 </script> 21 </script>
22 <?php endif; ?> 22 <?php endif; ?>